xm-test: Have domains deleted if they are managed domains
authorKeir Fraser <keir.fraser@citrix.com>
Mon, 3 Mar 2008 10:54:24 +0000 (10:54 +0000)
committerKeir Fraser <keir.fraser@citrix.com>
Mon, 3 Mar 2008 10:54:24 +0000 (10:54 +0000)
Have the domains deleted if they are managed by xend and the tests are
run with '-md' as parameter to runtest.sh.

Signed-off-by: Stefan Berger <stefanb@us.ibm.com>
tools/xm-test/tests/security-acm/10_security-acm_pol_update.py

index b85079de35ad8790b6df765f2e93fb18dd43687f..441febbf0102667b5548d44f108b9e150e5eeb0f 100644 (file)
@@ -51,7 +51,7 @@ try:
     domain_ul.start(noConsole=True)
     FAIL("Could start unlabeled domain.")
 except DomainError, e:
-    pass
+    domain_ul.destroy()   # delete if xend-managed domain
 
 
 config = {"access_control":"policy=%s,label=%s" % (testpolicy,testlabel1)}
@@ -246,7 +246,7 @@ try:
     domain_red.start(noConsole=True)
     FAIL("Could start 'red' domain.")
 except DomainError, e:
-    pass
+    domain_red.destroy()  # delete if xend-managed domain
 
 # Terminate GREEN domain
 domain_green.destroy()